Merge branch 'ak/commit-only-allow-empty' into maint