Merge branch 'main' into 604-Clean-up-SPAR-debug-switches