(CE-352) Fix makeCollapsible error
Merge branch 'CE-352' into dev