Yeah, updating to do a conditional encode of version 5 (if no hash) or version 6 (with hash) and require version 6 to decode the new one. Also adding a feature bit to cover, but need to think through the full mechanism for that a bit more.