(cherry picked from commit b54711799e496f70dcd934b69317f4a6e2799276)
(cherry picked from commit 2512806808060270860d1ba899f60446f61bd5ff)