Merge branch 'backport-vs-16.4-global-targets'

8 jobs for vs-16.4-global-targets