Merge branch 'backport-3.26-FindPython-SOSABI-handling'