(cherry picked from commit d7427bf49cd4c33f62b60f085d827b6d5860b483)
(cherry picked from commit aa964e17d6d58df36430ebfae2a1cada8e6def4b)