(cherry picked from commit bb10e5e4a8c7f878d9c777e4916794577a4ce57f)
(cherry picked from commit 08ec5beea4a9d40970f0a134e2511913c1c304c2)