Backport for https://jira.talendforge.org/browse/TDI-29732 on
maintenance/5.5.
Merge pull request #1 from ggu-talend/maintenance/5.5

Backport for https://jira.talendforge.org/browse/TDI-29732 on maintenance/5.5.