Re #7855 resolving minor conflict