Merge branch 'main' into 92-spar-code-redundancies-2