JUNIPER-ONLY: fix PR 846796