Merge branch 'configurable-federator' into 'develop'