detection
Merge branch '1.0-detection'