(cherry picked from commit 63c40c2ad66e5b32d96cecad0b123db28783ae5c)
(cherry picked from commit e5754418e03bcd79bb4bade266f47d83d00864bd)