(cherry picked from commit 7804f19d27d65af855e145de1953df9a553f3ce0)
(cherry picked from commit 9abd6fc9c5c508499e7d3d9ed525ff57edaead31)