Merge pull request #539 from zadjii-msft/dev/migrie/sync-upstream ...