(cherry picked from commit d80b0eeee59fa48f2506fe103de1b52ef6de3f4f)
(cherry picked from commit ebd14bfce9ef6b4bf41129a329823130d1002f42)