decreased unicorn workers to 6
Merge branch 'em2-master' into em2-stable