feat(collapse): rebased ontop of #991