Merge branch 'main' into 1237-small-speedup-of-prepare_instrumentation-sh-script