Merge master into io_cleanup