Ensure controlled Tabs
don't change automagically
#1680
Merged
Tabs
don't change automagically
#1680