Support disabling tab - need test and docs change