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