(cherry picked from commit b1e0c313) (cherry picked from commit 34882192) (cherry picked from commit 94adf918)