CAS-1384: Formatting update, and a change to the message bundle.