Additional fixes for IOExceptions. See https://trello.com/c/4rdEwSXh
Merge branch 'master' into topic-data-incrementalupdate