TDM-608

please merge this patch to talend:master