Merge branch 'mingw-windres' into release-3.24

Merge-request: !7964