Merge "Add negative guard"