(cherry picked from commit e00c3b0322dfdc3dc97d9f0f5332372cf7d926c0)
(cherry picked from commit e0acf29c229dea1fce4f9ecc7ba9a530ba51bb74)