(cherry picked from commit fd987e63)
(cherry picked from commit b30940b5)
(cherry picked from commit d539e535)