Merge branch 'main' into 611-make-local-run-of-the-selection-be-test-easier