(cherry picked from commit c340385db1bab97aa565665de7399c05377259d4)
(cherry picked from commit ba7270dad0de6938e8d44c029f26621f399cd5d8)