Merge "Fix bad references in preloaded-classes" into klp-dev