(cherry picked from commit f986c7c3541f032da16736f43fd34c92337242c4)
(cherry picked from commit 6f6a46ec1e26294e4a478fc6dee158123ccba406)