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