Merge branch 'main' into 905-running-self-test-without-debugging-macro