Merge from Juniper:master