(cherry picked from commit 86ae43bc23afb68dc6c6b13b147e4e64a2d34077)
(cherry picked from commit aa71245fd278d7d9575fd8dae4b05901516c847e)