Merge "Replacing deprecated method" into tm-qpr-dev