Merge branch 'FindPkgConfig-LIBRARY_PATH' into release-3.22

Merge-request: !7258