Merge "Add missing validation in data classes" into udc-dev