Merge branch 'fix-find_program-regression' into release