Update packet format.
Resolve merge conflict