VES-2347

VES-2347