Merging master to master_vca_intg