Merge "Fix type to callable on FileRepo::getErrorCleanupFunction"