(cherry picked from commit 3c8854f9de99baffd70d96ff50fcb8364d37af81)
(cherry picked from commit cc001e951e7858372288f91b1fe54a8225974cdc)