Fixed validator errors
Merge branch 'v1.2.2' into develop
Merge branch 'develop'