(cherry picked from commit 94fecf6b4da4a2a6ca0217d5d856b5a4e1b6e8c2)
(cherry picked from commit 82e8965b8065200309b2e4f35fc8e214a0f7d9a3)