Merge from 4.1-dev for TRQ-1300 - recover jobid.