Merge branch 'nmake-rsp-encoding' into release-3.21

Merge-request: !6905