(cherry picked from commit c6809724d3e360d056014c13f624f92498be98b9) (cherry picked from commit b77755b8e8ba133248b2b9fc89db03deb0a10b99)