Merge branch 'object-normalize-refactor' into 'develop'