TRQ-2707 - Merge from 4.2-dev.