JUNIPER-ONLY: PR979755 for SDG device again