Merge VIG#12. Close #12