Merge branch 'main' into 1841-remaining-todo-from-merge