Merge "Hunter stable branch for Samplevnf"