(cherry picked from commit 14c077a33c6e66ea833b6dbe71763f96c6979dd3) (cherry picked from commit 770a14c0035f846d3b7af5c28ea78af2b4f26591)
(cherry picked from commit 14c077a33c6e66ea833b6dbe71763f96c6979dd3) (cherry picked from commit 770a14c0035f846d3b7af5c28ea78af2b4f26591)