Validation changes
Merge branch 'hotfix/0.0.9'