(cherry picked from commit a636192ef22ee69d792b0ca7db1c6be963be9cb2)
(cherry picked from commit c0a0e5b52240ed415d3b43ba77659821887bf50b)