Merge branch 'vs-rc-flags' into release-3.9