AG-3851: corrected context
AG-3863: serializer changed to protobuf