Plain Diff
Merging changes needed to improve the integration with Spanish Federated EGA See merge request !1