Merge "Trim invalid users" into oc-mr1-dev