Backport "Fix #20856: Serialize Waiting
and Evaluating
as if null
." to 3.5.2
#619
Loading
Waiting
and Evaluating
as if null
." to 3.5.2
#619