merged in the payload_generic_decoder from the PayloadJsonDecoder branch