Updates after sync from mainline
Merge pull request #33 from Juniper/nipak-v6-merge

Updates after sync from mainline