BACKLOG-889 Scoping is only relevant for IdP's
Merge branch 'BACKLOG-889' into develop
Merge branch 'BACKLOG-920' into develop
BACKLOG-949 Add index for allowed and blocked entities to improve performance (created by Geert vd Ploeg
Merge branch 'BACKLOG-949' into develop
Merge remote-tracking branch 'origin/develop' into BACKLOG-920