Merge "Less clipping." into nyc-dev