Related to TRs #328 (Modify REST API to work in federated environments)