Ref #3766 - V2 format changed