Merge changes from 4.2-dev for TRQ-2436.