XD-544 - Fix In-Memory Analytics

Tested for all transports.