Merge remote-tracking branch 'upstream/dev' into experimental/windows-shells