(cherry picked from commit d6b564519bfef1baf2f43dd2cd4a6d8f9ffdc6b2)
(cherry picked from commit 348439a5cdaad7d0b4513f6fa9e72a7d8c72d741)