Updated TB3.0 to RC2