Merge remote-tracking branch 'origin/Tcoffee_JAL-1065' into develop