(cherry picked from commit fd447dc7a3c3ce4b582cd254d563ef2d2acef984)
(cherry picked from commit b9b8e99149b8978ab043934daf00202019d0aeac)