Merge "Do not preload NoPreloadHolder classes" into pi-dev