Merge "DO NOT MERGE: change preloaded classes" into klp-modular-dev