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

In fact, it's related to the backport subtask: https://jira.talendforge.org/browse/TDI-29732