BACKLOG-4071

Add collapse components