(cherry picked from commit ae0d36c1) (cherry picked from commit 61d29b7f) (cherry picked from commit fe01ff05) (cherry picked from commit bb9d8723)