[FIX][T2630]Return deferred

Merged Gastón Bertolani requested to merge 15.0-T2630-deferred into 15.0

Merge request reports