(cherry picked from commit 874ddbf0b5b1d34aca70ee7fc303cbffdde67236)
(cherry picked from commit cd9db822f0c1efc52005b1c069d52910d88038d9)