Merge branch 'cj/maint-gitpm-fix-maybe-self' into maint