Fixed bad merge of metamodel to master