(cherry picked from commit 074f9282dd410e25c8e3785b931fa10106e9ee8b)
(cherry picked from commit a1dbcd1f003c6e4ce8f431277affb952dab84195)