Merge io_cleanup into master