(cherry picked from commit bb3fcc8611dd5ab5532eaacfa9e51883e1e2efd2)
(cherry picked from commit 669d9696d52136558c37489cc2d8916a5b6f893e)