(cherry picked from commit 7cf77968)
(cherry picked from commit 342757b4)
(cherry picked from commit a02b02fa)