Re #6972. Got search working on big cleanup.
Merge branch 'feature/6972_offlinehelp_integration' into develop