(cherry picked from commit 42c151fda8e7b4e94e1f38e59aaaedd50064a44e) (cherry picked from commit 9e8e0770b7fdff1cf59c906d26ba7a4623f87851)