Merge v1.1 to master_vca_intg