(cherry picked from commit fb1992a43488cf33f38cbbee38c4ebad5d009b73)
(cherry picked from commit 242e75a6b7acea0115436d5aa3e0848c540d5b65)