Develop branch

This should include the objectcreator changes.