Merge branch 'main' into ci/restore-level-before-comparison