VID-2130 porting over whole file rather than one piece. Fixing race condition