Update manifest.pp
rebase witih upstream master