Merge branch 'main' into fix/issue-9937