Merge branch 'vc_upgrade'
Merge branch 'master' into type_list