Merge branch 'rel-win-docker' into release-3.21

Merge-request: !7087