Merge branch 'backport-try_run-cross-compile' into try_run-cross-compile