(cherry picked from commit 3945ccc5b289fb12121d4fd13147247b938c0471)
(cherry picked from commit 753b22f445d29f4249d73652f2cb1f5195110279)