cleanup some validation errors
Merge branch 'hotfix/1.6.3'