Re #7855 Fix conflict with most recent version of master