Fix for ClientBackfillFeature
(still a problem with infinite loop)
Add gson serializer for message
Fix for some merge errors.