(cherry picked from commit 0c651d32) (cherry picked from commit b6811758) (cherry picked from commit 7ebb0f11)