Merge "Make VCN HSUM compatible" into main