BugTDI30473: Append TUJ for testing
Merge branch 'maintenance/5.6'