Merge branch 'jk/refresh-porcelain-output' into next