METAMODEL-44 Fixed (patch submitted via Review Board)
METAMODEL-43: Fixed