(cherry picked from commit d8671b1c) (cherry picked from commit 84e1819e) (cherry picked from commit 03af9b14)