Merge branch 'backport-4.2-find_package-stack' into find_package-stack