(cherry picked from commit 15f4dabd8c2dd8417ca4350ad736fb9929dcc6d6)
(cherry picked from commit 4146fd960c379973c83eb4e0ea35680a98f4bc41)