Merge "fix vcpeutils"