Merge branch 'bugfix/actor-containment' into 'develop'