(cherry picked from commit 63c40c2ad66e5b32d96cecad0b123db28783ae5c)
(cherry picked from commit 0827fc72d08609c00cfe219adb5279136d320160)