TDI-31486:
https://jira.talendforge.org/browse/TDI-31486
Append TUJ to illustrate the changes.
Merge branch 'maintenance/5.6'