(cherry picked from commit 0beea590) (cherry picked from commit 0a585117) (cherry picked from commit d2cf7d7d)
