(cherry picked from commit 773b1a79) (cherry picked from commit 5b2442d5) (cherry picked from commit 4441844d)