Merge "Add replace opt to lpadd make build mixing easier"