Merge branch 'main' into combined-prs-branch