(cherry picked from commit dfb310c4506c42516a55c983449cb3ef8b0d1fb6)
(cherry picked from commit 11c375590ad89befe88f6f22abfbc6d0ac9d6549)