Merge "Remove fullstop at end of phrases" into nyc-dev