*8787* Remove delays/timing problems in data build