Pull changes from Juniper/sm to absingla/sm