[stable-3.13] Bugfix/use file id to track renamed items

[stable-3.13] Bugfix/use file id to track renamed items #1382