Merge branch 'FindMatlab-no-CMAKE_CL_64' into release-3.12

Merge-request: !2354