Merge branch 'vnffg'