(cherry picked from commit 6abd991c) (cherry picked from commit 3dabd7f8) (cherry picked from commit 912ae8fa)