Merge "More support of snaps for VNF"