case-3590 - Collapsion fix
Merge branch 'case-3590' into development