Merge branch 'fix/slow-federation' into 'develop'