(cherry picked from commit fe4ec144d1a18a94de782f87fff56bbf1cd3a00a)
(cherry picked from commit c78992dbeb0c7261821fbc607308af2bb4dcc779)