Merge "Assign a new future before calling update()"