Merge branch 'main' into 42-revise-configs-and-update-to-latest-test-plan