(cherry picked from commit 318d5261ad9184d4d3fd024945c5ba318f465707)
(cherry picked from commit 5bdf0fc0fff9fb1cdf6dfcef47de427a00ad281c)