(cherry picked from commit 74b6fd9526ca645bd855c1ef19920c92876d1884)
(cherry picked from commit 93044eb617ff01792b166a68e35173b964894fa7)