Merge branch 'mg/verify-commit'