Re #7855 fix conflict with master