Merge "Improve notification message" into tm-qpr-dev