(cherry picked from commit 60a91537f7ea1225b5ca67f6dd9ef358b33939da)
(cherry picked from commit b2678ba89f5f2842726464f475343b279db4251f)