(cherry picked from commit 67135e5d6f999f6eb9fba0fa20d29cf3bd664cea)
(cherry picked from commit 877ba9bf17743cb7a1940ec62171eac98fd99045)