Merge VIG#22. Close #22.