(cherry picked from commit 68a3d915) (cherry picked from commit 4657ed6f93c2e2edd47e65035edfea21fcaa26dd)