(cherry picked from commit 4362251b599a1568087eeba412f36e6ee03c9c60)
(cherry picked from commit 0ae6139e92110f3dbf7fcf766263880725f69dff)