Updated to correctly reflect Georgy's code fixes and enhancements for ContextHelp