(cherry picked from commit a636192ef22ee69d792b0ca7db1c6be963be9cb2)
(cherry picked from commit c65f76f56278f74082c4fa792ed49104d5d33c38)