TDI-31442: The last temporay branch of TDI-29856 has compile error
https://jira.talendforge.org/browse/TDI-31442