I decided to just make these top level classes so that FutureUtils does not become bigger.
Merge branch 'master' into unstable_staging