Merge branch 'check2' into ecore-dev