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