Merge branch 'feature/object-normalization' into 'develop'