(cherry picked from commit a4d9944d9af5add44e4ec076d7665d4108c1d5f2)
(cherry picked from commit 88a2557b1a5aa68af23ccd5dc2c7b93355a43179)