feature #1713: Deal with concurrent renames