(cherry picked from commit 3286e06be1521cd39d9dad2ce1e64ac4f0beafbf)
(cherry picked from commit 7a7793befabe657bb759efb129974675560718e2)