(cherry picked from commit 0165705626bce7755cbefe94ce45d126bfd9771a)
(cherry picked from commit 3f8445141bea9dbf276a6a336114e4e2b549936f)