(cherry picked from commit bbd120354a8d226b446591eeda9f9462cb9b690a)
(cherry picked from commit 257bfff316e4efb8952fbeb67c91f86af579cb0a)