Merge branch 'main' into 69-support-translations-early-on