bump  protocol version to 21 - 1.7.x, re-enable serialization of empty stuff as performance change is small