(cherry picked from commit 4a1cedc010d3fa1d8ef3f2773ca12acadfee5ba5) (cherry picked from commit 74e2b5efa26f27027fed212b4b2108f0e95587fb)