WIP: Update after EH23 #13

Draft
kritzl wants to merge 2 commits from eh-update into main