Merge branch 'bugfix/federation-kroeg' into 'develop'