Merge "Drop invalid data." into tm-qpr-dev