Merge branch 'hotfix/0.0.8'
Validation changes
Merge branch 'hotfix/0.0.9' into develop