Merge branch 'restore-windows-resources-through-link' into release-3.11

Merge-request: !2147