Merge branch 'main' into ci/maintenance