Merge branch 'Release_2.0_Dev_Branch'
Selectively merge branch 'master' into Release_2.0_Dev_Branch (vendor rename commits only)