more patches, accessible patches are being backported from 20 so they need some work
add original version of 0001 patch for reference