Merge "Fix API numbering issues" into nyc-dev