Merge branch 'FindMatlab-mcr911' into release-3.22

Merge-request: !6976