(cherry picked from commit d14d442157c76fb901ed3647ad5ecdcd3c9c79ad)
(cherry picked from commit 7ee63df142fc363c4ab927a5ba9078aab9bad70d)