Re #6924 Fix minor conflicts