(cherry picked from commit 7c674191) (cherry picked from commit 74fbb83a) (cherry picked from commit 662d14c5)