Fixed by new CCAPI implementation.  Tracked by server identifiers (UUID).