including patch in-repo as it needs modification to remove the changes to NEWS but fetchpatch doesn't work here