(cherry picked from commit 3a94f9987bef5f8036204fbc34362db3be1912c2) (cherry picked from commit 5c09d37f19f3b81a5b043de3a6c07556c5912aa0)