(cherry picked from commit 6c19528306c911b9ed86a4d050d2d7e8ce1dc76f)
(cherry picked from commit 90192a3d81d6579746cf6548532006feefc522c0)