Fix not returning

Merged Santiago Said requested to merge fixNotReturning into 12.0-stage

Merge request reports