JUNIPER ONLY: merge some changes from 133R2 to 14.1 <0409-0507>