(cherry picked from commit 1f1ffc8a1d3b08f900ad3a2ee5001e5e40969641)
(cherry picked from commit a4afa9b29e703d1f995e332806079f097b57ea0f)