Merge branch 'pipe-format-simplify'