(cherry picked from commit b1394d6307425a41d388c71e39f0880babb2c7a9) (cherry picked from commit 92a3dbe44ffb113dead560fc179c2bc15fd6fce8)