Re #9249 Resolve conflict in develop. Bad merge. Fix Build.