Merge "Sanitize text fields" into rvc-qpr-dev