Merge fix for TRQ-899 from the 4.2-dev branch.