(cherry picked from commit 77a5b94c1bce0f43de03b9258b387dbd9ee8ff50)
(cherry picked from commit 847ca2845d934300313a9f7bfdcf727f1ebe8341)