(cherry picked from commit 160dadc0) (cherry picked from commit 7563de50) (cherry picked from commit f54b97b1)