(cherry picked from commit 2793ce6bb0023c1b0d92288696cb147539392fb2)
(cherry picked from commit a0a5cf70e9c357e64b09257b95ccda142e4ac13d)