Re #7855 Resolve conflict with master