JUNIPER-ONLY: change for PR 1000901