Merge branch 'refactor/object_validator_validate' into 'develop'