(cherry picked from commit ccd240f4e8a5c717ed3d3929c1b710714ad54527)
(cherry picked from commit 7b34c5eb66509851e993df19335a5ebedd0f3055)