(cherry picked from commit e198f4076cc7dbd8712a7a1785d4a586b4697038)
(cherry picked from commit 0cfdd8328e67f588e16562736284a21139cf6b43)