Merge "Final N API." into nyc-dev