Merge branch 'release-4.0.2' (early part)
diamond op
diamond op
Fix a bug where SPs were also returned in a list that should contain only IDPs
Merge branch 'hotfix/fetching-all-idps-must-not-contain-spsa' into develop