Julientalbot
# PR #32777 / #108747 salvage