(cherry picked from commit 6be6d69ad8e5fb05d839e2649b1f444613eea6d1)
(cherry picked from commit 60a91537f7ea1225b5ca67f6dd9ef358b33939da)