Merge "Split Tab2 into it's variants"