Merge pull request #19973 from julienmalik/borg