TDI-30874: Append TUJ for illustring the solution
Merge branch 'maintenance/5.6'