Merging the goods from master to hapi8