JUNIPER-ONLY: PR1040678 and 1043048