Merge "Validate incoming data properly." into oc-dev