Merge branch 'bugfix/federator-actor-error' into 'develop'