Fix for TRQ-1841: McGill - 4.2.2 data staging broken.