(cherry picked from commit 3b6179f1) (cherry picked from commit 049fb020) (cherry picked from commit 10d3bb7a)