Add patch for 1.21.1