Added to javadoc why we don't use futures here
Merge branch 'unstable_staging'