Fixed picking agent
Merge branch 'master' into AWS
Verbose -> False