(cherry picked from commit 86323f970b0a8eb466a3865ecc9d9f32f2df82eb)
(cherry picked from commit c445173855aece19a97a548bacad624c8414ad31)