(cherry picked from commit b95a17a4e0454268e76f70039a2171bc3f51ba59)
(cherry picked from commit 5f567cf13898b355bcd445749f86c316a53a3a28)