(cherry picked from commit d583001723e9ad4588c5b54c9f27c111758fe105)
(cherry picked from commit eb02dc0c4a14d5a15f3443567bc12abf631c300a)