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