BACKLOG-1144 Merged Dummy Idp and SP