Add basic patch for 2.0.0-p247