Merge "Modified vf-module-name"