(cherry picked from commit 63c40c2ad66e5b32d96cecad0b123db28783ae5c)
(cherry picked from commit 50427565f166bb2308a6cf298a6d0dcd7568579a)