Case 3994 - Ting extended search module.
Merge branch 'case-3994' into development