Merge "Reduce unnecessary measure" into tm-qpr-dev