Align with pipebackend as per #1137 and #661