- adapt patch for 3.10.x