(cherry picked from commit 1c3bb7fcab1c32af49a31d1bba5dfd417a7208d3)
(cherry picked from commit 629c69990093152e329f66f6b50c82dbc7a58ee3)