Improve PreloadEmbeddedSchema
performance
#1369
Merged
PreloadEmbeddedSchema
performance
#1369