Merge branch 'pb/maint-git-pm-false-dir'