Advanced help module update
Merge branch 'module_updates' into develop