1.42kMerge code: Branch to Trunk on

877Update/Syncing the fork with m