(cherry picked from commit c0a0e5b52240ed415d3b43ba77659821887bf50b)
(cherry picked from commit c65f76f56278f74082c4fa792ed49104d5d33c38)