Merge "Fix resume vfModule"