(cherry picked from commit fdbda9598462fad232b609a35091a73843706cf7)
(cherry picked from commit 767d503790f546f3d5b7662da84ac98e6ee2693d)