(cherry picked from commit 4180e2787a1ad5284873de4847f345b2c47df72a)
(cherry picked from commit 3ff3de6b90704fba266833115cd9d03ace99aae9)