TRQ-2646: Improved prior checkin.