Don't initialize collapsable unless enabled
Merge branch 'collapsable' into dev