Merge branch 'main' into 671-set-up-be-to-selection-tests-with-debugging-disabled