main
Fixes issues and updates to M3
Run spotless in configuration cache compliant manner
Apply suggestions from code review
Minor tidy ups (#935)