Federation should keep keys for the users
Merge remote-tracking branch 'origin/master' into deploy