Merge "fixes in Future.java"