Merge "Fix data validation"