Re #6924 Fix minor conflicts
Re #6924 Fix minor conflicts