JUNIPER-ONLY: manually merge fix for NMS-6533 to 13.3