Merge branch 'anehmer/entitytypes' into anehmer/integration