Merge branch 'vs-v142-csharp-flags' into release-3.16

Merge-request: !3908