Reverting branch commits from the master
Merge branch 'master' into METAMODEL-99
Reverting merge commit with master.