(cherry picked from commit 94673d41) (cherry picked from commit f13a2942) (cherry picked from commit 97551107)