Merge "Fix CRLF" into nyc-dev