Merge "Revert^2 "Removing all restored backups except one so we don't have old backups"" into main