Merge "Support replace op in new pipeline" into nyc-dev