BS-7981 Fix a previous merge (by hand ?)