Merge branch 'bs/maint-commit-options'