DEVSUPPORT-1151 optimise data download