(cherry picked from commit 4ff9a1408d5bb00be361d9843afb04dc3d4354e2)
(cherry picked from commit 91ed0475fce431322bef33e0ccb2465d2213f87f)