Merge "Optimized the memory consumption and renamed PRN" into nyc-dev