Merge branch '604-clean-up-or-document-remaining-debug-switches-in-code' into 'main'
Resolve "Clean-up or document remaining debug-switches in code" See merge request !871
Resolve "Clean-up or document remaining debug-switches in code" See merge request !871