Merge branch 'ab/commit-m-with-fixup' into maint