(cherry picked from commit 55447a7f1c0f3e5c91724df9a581222e52c15739)
(cherry picked from commit 8f15c7e5f769d03932b79a10cbb739da93c5a4e9)