Validation fix for file uploads
Merge branch 'hotfix/WKS-240'