Merge vasa-chi-patch-1