todo for WELD-1035 for message-events