JUNIPER-ONLY: manually merge the new patch