(cherry picked from commit d1a63bf19c6c75430393dab94f5e939b258ffdb6)
(cherry picked from commit 858b0157e56426ee0d56faae393fc85b361ffd90)