(cherry picked from commit 880c7f1ae9e96c5b3dedaca01bf3736e7dd869d4)
(cherry picked from commit 9458edb30bbd23db3484d71c9d4caff695008f7f)