Merge branch 'ad/commit-have-m-option' into maint