Merge "update preloaded-classes"