Merge branch 'jk/diff-do-not-reuse-wtf-needs-cleaning' into maint