Merge "Cherrypicking the following change to TM QPR." into tm-qpr-dev