Merge branch 'main' into fix-issue-7240