Revert "Merge branch 'object-creation' into 'develop'"