Merge pull request #198 from microsoft/dilan/sync-main-bugs-7

Merge pull request #198 from microsoft/dilan/sync-main-bugs-7 #452