federation controller changes

George Papathanailrequested to merge
dev-branch into main

Merge request reports