Re #7588 last tiny difference to merge