(cherry picked from commit 63c40c2ad66e5b32d96cecad0b123db28783ae5c)
(cherry picked from commit 33b38f37b2cc45d6a7bce5870e75b8a65a5b0f02)