TRUNK-4443 Corrected messages

(cherry picked from commit d8ea99e1c7544a346d525f025f293214713f04ea)