(cherry picked from commit 4a60839f51870221dd599d02277947c356250947)
(cherry picked from commit 30db137f7ebc504a7d2ebad08bcb37a059d1d6a4)