Re #10836 Trying to fix merge problems