Merge "Refine the naming about compatible scale" into tm-qpr-dev