SCI-1544: Stop creating/removing working directory
Merge branch 'master' into actorv5