Merge changes from branch FileHandling.