(cherry picked from commit eb6ea34081ebb9790a1cc4e484fb4c07dbfeabf6)
(cherry picked from commit 130f575da86e23095d2b626ff8af133a7122ab2e)