#4137 changes to avoid serializing metamodel
#4137 changes to avoid serializing metamodel
#4137 fix build