(cherry picked from commit 6c81bef9a0cbe391ebf42096dc33ae0d99cf79c8)
(cherry picked from commit 4146fd960c379973c83eb4e0ea35680a98f4bc41)