(cherry picked from commit 2eb6ad6a05224b3caafc59565fd5fa6bdd819870)
(cherry picked from commit fe4ec144d1a18a94de782f87fff56bbf1cd3a00a)