Merge "Lowercase s." into nyc-dev