WIP: next #1

Draft
mara wants to merge 6 commits from next into main