leave 2d tubes in batches
Merge branch 'leave_2d_tubes_in_batches'