Merge remote-tracking branch 'origin/feature/6941_compiler_warnings'
Merge remote-tracking branch 'origin/feature/6136_instrument_components'
Merge remote-tracking branch 'origin/feature/6850_extend_NormaliseByDetector_userfitting'
Added a null pointer check. Re #6951.
Merge branch 'bugfix/6951_arrow_tool_crash' into develop