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