(cherry picked from commit 584caba421e7c8679c75771152994f7ad957218b)
(cherry picked from commit 4a8735c628896b063e07d5cb7fc4467b273806c7)