Merge "Fix issues in hc2vpp-csit scripts"