Merge "Fix TLV functions"