Merge branch 'main' into ci/update-wmc-tool