fix preloaded-classes
Merge remote-tracking branch 'revolt/jb-mr2' into jb-mr2