Change attach formatter behavior
Merge commit '8e89f3bc3b2f0bf9ab433d3e6b632cf0c72ab445'
Merge commit '7b3ce3084e028a7ee5ab8950a68a3d73300381fd'