add patches from NF