Merge branch 'doc/JAL-3608+JAL-3830_added_to_help_docs' into develop