Merge "Bug fixes October 16"