Merge "Improve resolved classes saving strategy" into nyc-dev