(cherry picked from commit a1f7e44e17bb41f48976b69f4dbe5278cbad06b2)
(cherry picked from commit 7f8f4b0dd92358ba687f8230a922d8f316cb06e9)