Merge remote-tracking branch 'remotes/origin/main' into test-deactivated-debug-switches