Latest changes on hcmpv2