(cherry picked from commit b7ddd92729d52a8c43d72010b743f7e3477f1001)
(cherry picked from commit 44c4d7b9521fe449e61edc614446195861932f8c)