(cherry picked from commit 97f39da3c79c82aff152d745016b2d531e49c866)
(cherry picked from commit c515a2167b9d55276c6e4706f915e2589768c240)