Merge branch 'main' into ci/extend-complexity-measurements