Merge "[DO NOT MERGE] Fix extra constant value AGAIN" into tm-qpr-dev