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

[stable-3.12] Bugfix/use file id to track renamed items #1364