WIP: Terminated call message bug 1022594