(cherry picked from commit f8230bb0f482e639b09d84c2ffaf2ca95c179427)
(cherry picked from commit f3f86d47220e2c2332d60f6bd0a89b76a628529d)