1.40kMerge code: Branch to Trunk on

866Update/Syncing the fork with m