Remove adding object type upon first object creation in editor
Merge remote-tracking branch 'origin/master' into Design