Merge "Update preloaded-classes for KLP" into klp-dev