Merge branch 'main' into test-deactivated-debug-switches