WIP: next #5

Draft
mara wants to merge 2 commits from next into main