(cherry picked from commit 63c40c2ad66e5b32d96cecad0b123db28783ae5c)
(cherry picked from commit 0ddbae4a162e38ca1492ac6b0efa105bcee2f723)