federation refactor
Merge remote-tracking branch 'upstream/master'
Merge pull request #570 from patriot1burke/master

federation refactor