Detection script
Merge remote-tracking branch 'origin/detecttest' into develop