(cherry picked from commit ed7c5a937f4b50fcdf819e8fe347c8c0bc6bd2e7) (cherry picked from commit 11bd764a75d3b97117098738d3489c4b3329738f)