Merge branch 'master' into master_vca_intg