Feature/latest vendor versions