re #9575 completed 1-3, next one is NormaliseByDetector.cpp