Merge pull request #4584 from geoffreysisco/fix/failed-drawer-rename-file