Merge branch 'main' into ci/avoid-excessive-printout-in-ci-jobs