(cherry picked from commit 5987f9c815d13df133841c4873b2aa9c394bc433)
(cherry picked from commit 017b1b5eb812ba18c3577ff79c544a25f7f91aaa)