Merge "Finalize resource IDs for N." into nyc-dev