JUNIPER-ONLY: 883879 and 887633 issue