(cherry picked from commit 2f9111847260874c8b3718469075ab32f0821f1a)
(cherry picked from commit 4348755ca22a3233ba2b55c19eb87073937498cd)