Code duplication reduction for new ImmediateFuture unit tests
Merge branch 'master' into unstable_staging