(cherry picked from commit eb73d021)
(cherry picked from commit 7af66ba3)
(cherry picked from commit 44fd8073)