Merge branch 'ninja-multi-rsp' into release-3.17

Merge-request: !5020