(cherry picked from commit aa97912e0e71400ec3a60a49df7a403f500fd504)
(cherry picked from commit 8da4e5802a7be14be03f2648d50726be74349f75)