(cherry picked from commit 132c2e7a2a2dcb8050770a85aca8e66a7c33934b)
(cherry picked from commit 89354f0475efa8e393697b1ddc227c94a76b5923)