JUNIPER-ONLY: change for PR 899760