Merge "Hide redundant restrictions" into nyc-mr1-dev