(cherry picked from commit 059eadf06408861f015f277c0549c58dce17ffbb)
(cherry picked from commit 7bf17d9fe03998a60c75a7860c8915d36d96e207)