Merge/futureresource fix

Merge in the bugfix in bdf60cc and add some logging.