output sources no longer return futures
Merge branch 'develop' into feature/mongodb

* develop:
  output sources no longer return futures