(cherry picked from commit 74fd0850d61f8ba464ff08ed42c4019d27722fb3) (cherry picked from commit b6917447)