case 2737 - Collapsible fieldsets.
Merge branch 'case-2737' into new-search