Merge "Adjust VFC modules to latest"