TRQ-2410 - one more merge from develop.