Merge "Update VVM API"