Merge branch 'jk/maint-status-porcelain-z-b' into HEAD