(cherry picked from commit 3c3335c7) (cherry picked from commit 12600fdc) (cherry picked from commit aed5fb1d)