Changes to allow packets to have null payload.