Nico branch

possible solution for tabs on 3.6