(cherry picked from commit 7384b6973498084f4082d7e1a805b84b13a3ba44)
(cherry picked from commit 624b3a449b5746cee84557992b9b217ac135cf50)