(cherry picked from commit 7db922c6474cb29e0e9bad320fcda4769366340a) (cherry picked from commit 0eb42e1e05b780dab718bb3adfdd55f527dd5545)
(cherry picked from commit 7db922c6474cb29e0e9bad320fcda4769366340a) (cherry picked from commit 0eb42e1e05b780dab718bb3adfdd55f527dd5545)