(cherry picked from commit f4425c72) (cherry picked from commit 5926f9f1) (cherry picked from commit 4d80c8f1)