Merge "To fix the test case fail" into tm-qpr-dev