Blocked all robots
Merge branch 'master' into curcu