Merge branch 'main' into 1171-scripts-self_test-py-usage-of-wrong-reference-executables