(cherry picked from commit a4fd6cd3) (cherry picked from commit 8b29c4a4) (cherry picked from commit 41395094)