Merge with VIG#27. Close #27