Merge branch 'vs-sln-version' into release-3.16

Merge-request: !4765