(cherry picked from commit cf83dcfebd73fc75174f3cc4113a7395d8aff2f7)
(cherry picked from commit a927b59bb2becf5b9879b61ec3c77bd17bb3b3ad)