(cherry picked from commit 5cfda1d92f38da9e5e4fab1413e6e52229a51639)
(cherry picked from commit dec400499e44c25a9f622424e5e26949f944b5a0)