Merge from 4.2-dev for TRQ-1841: 4.2.2 data staging broken.