(cherry picked from commit 1d4b768036f90c0e55a8fed83e11720f9a4d08df)
(cherry picked from commit 396042a7112f4f568fdea60b6eeca9a89e3b7413)