Merge "Improve notification message"