(cherry picked from commit 1db6e4588e33f8652853c3cd1e3ebab0d708b168)
(cherry picked from commit 361cb5d228987963b2489e683228983849ce5402)