CORE-5553: Added message and context help