adding updates for TB 3.0.0-wip branch