(cherry picked from commit 63c40c2ad66e5b32d96cecad0b123db28783ae5c)
(cherry picked from commit c312a40cbfe8b8edf4b1ab4853052952c85ab9ed)