(cherry picked from commit 347cbccd076fb4fbdca876e8de5e3578a0742552)
(cherry picked from commit 7fdce66badb133dd69f45d3b73978656b22ebe9d)