TDI-31275: backport on 5.3, 5.4, 5.5
https://jira.talendforge.org/browse/TDI-31275