(cherry picked from commit fb908e8e1969e633a50ca000c767a998427363b2) (cherry picked from commit 365a6e77a6530831eeeec7580406ff736da0e17a)