Merge "Remove duplicate code" into tm-qpr-dev