(cherry picked from commit 37f272b33a3d958b3082034ca6242274e7800376)
(cherry picked from commit 6723650cd9e60f836ada6637c84222b239fcc723)