(cherry picked from commit 3f094e0c) (cherry picked from commit 402d7fc1) (cherry picked from commit 5f3f3c15)