Yet another commit adressing MetaModels/core#607.