(cherry picked from commit a23b305e) (cherry picked from commit b9e6b124) (cherry picked from commit 9448c4fd)