Merge branch 'mg/verify-commit' into maint