Adding missing data sanitization
Merge branch 'develop'