SITE-753: Updated client/server source for Federation..