(cherry picked from commit 313625b0adbc712b6ddac276625da200dc78282d)
(cherry picked from commit dfd7f670ec116b972f9ee5170ba6e3518f066aac)