resolved conflicts for merge of 802527c6 to master skipping preloaded-classes as pre Bob