Merge "[DO NOT MERGE] Fix NPE caused by misplaced parenthesis." into nyc-dev