[ADD][TOM-319]No send_late together with custom_pickup

Merged Gastón Bertolani requested to merge 15.0-TOM-319-fix-errors into 15.0-stage

Closes TOM-319

Merge request reports