Merge "String change to highlight calculation stopped at last even hour" into tm-qpr-dev