VE-114

**DO NOT MERGE**