Merge v1.1 into master_vca_intg