(cherry picked from commit 9deed218b5d74591c6cb4e77029302f189decfac)
(cherry picked from commit b6cab65b9ca23dc57a090d03404f7f97ea9ef248)