Merge "Future.java - sonar fixes"