Merge branch 'backport-vs-lang-flags' into vs-lang-flags