Merge branch 'revert-windows_symlinks' into release-3.11

Merge-request: !2114