BZ-9406: updates to messages