Re #7855 fix conflict with master
Re #7855 Fix minor conflict