(cherry picked from commit 7f3bf53e4ce37e8fd286ede4ca0298aeb9ca217a)
(cherry picked from commit 68e94e5447622114ee014d8d62ecad65aa6254b9)