Merge "Add remove op policy option"