#3371 update messaging