VE-1263

DO NOT MERGE