Merge remote-tracking branch 'origin/main' into 576-revise-automatic-complexity-measurements-tests-and-reporting