Merge branch 'main' into sgi-fix-237-branch