Merge "ART: Slightly change InitializeClass flow" into nyc-dev