Merge branch 'main' into draft/lm-changelog