Merge "Avoid inverse transform/recon without residual"