Update master branch with new_vt_web branch