merged some created parts of the meta model into upstream