Pull changes from Juniper/third-party to absingla/third-party