Merge branch 'pb/commit-verbose-config'