case-3406 - Collapsible items
case-3406 - Collapsible items fix
Merge branch 'case-3406' into development