Backport some changes from RichFuture

Merge request reports

Loading