project-12346 Added an expanded message

Merging into development