Merge branch 'main' into fix-instrumentation-silent-failure