Re #8365 Detector / Intrument merge imcomplete