Merge "Fix extra constant value" into tm-qpr-dev