Merge branch 'find_package-fix-NO_MODULE' into release-3.15

Merge-request: !3557