Merge branch 'bc/maint-status-z-to-use-porcelain'