(cherry picked from commit 8fc9f64d) (cherry picked from commit 7111eff8) (cherry picked from commit afa97c65)