Merge master -> master_vca_intg