Turning on detect_dependencies explicitely
Merge branch 'master' into edge