(cherry picked from commit 53ccdba0b39ef2426048bd84744b75182085eef5)
(cherry picked from commit eca1df0206fbf904011d7b470426ba971afa7830)