(cherry picked from commit 29abf40211a15cc48fc7eeb058c33eeb18570bd4)
(cherry picked from commit 5c69f8d5e0395e5d46f5eddccb2b422e1642216b)