merge in branch add-model-specs-factories