(cherry picked from commit 36a033027734b8c69de1347b8803837135263677)
(cherry picked from commit ce9317e3d0d5eeee963accf538efa9f96c8671ca)