Merge "Bug 650: Removed uncessary wrapping and allocation of futures"