(cherry picked from commit 8288db9e9d9c4939a4a7a5ba5eeb105e486ae4a6)
(cherry picked from commit 737254f2280a507b1f1b780bec8f663e4748e870)