NEXUS-7608: More collapse