(cherry picked from commit 093e8e5c5afe970d5aa2f1c237d43ac7936256b2)
(cherry picked from commit 046f09c4bdf8fe8bfe5886afefa0e440376184e7)