Removes debug
Added mapping code
Merge branch 'federated_auth_plugin' into moonshot-v3
Fixes FK mapping (ExternalAttributes/one)