Cherry-pick MR for !451, to make tests pass also on the 6.2 branch.
(cherry picked from commit 9ad26d01)
Co-authored-by: Fushan Wen qydwhotmail@gmail.com
Cherry-pick MR for !451, to make tests pass also on the 6.2 branch.
(cherry picked from commit 9ad26d01)
Co-authored-by: Fushan Wen qydwhotmail@gmail.com