Merge for TRQ-2707 from 4.5-dev.