Merge "Remove warning" into nyc-dev