(cherry picked from commit 77fe7d15) (cherry picked from commit dd8454c1) (cherry picked from commit be316678)