Added patch for 8.x-1.x-dev