(cherry picked from commit 63e26a4b2880eda7b6ac7b49271d83ba3e6143c4) (cherry picked from commit c214ba253327114c16d0724f75c998ab00d44919)