Some messaging updates
Merge branch 'dev-BAU-116' into release/2.5rc