(cherry picked from commit 84db89d07db53dce217f29d913eaf4ce5eff4a6f)
(cherry picked from commit f8ecc5c42f4db067372d425facf2f4eb4b308959)