(cherry picked from commit 1aaf9b4d764da5aa8c1297d87ad1002bf1d7a7ea)
(cherry picked from commit 6c8e116e8bbaecce2b77fd9e0db89f366b57f9b6)