Merge remote-tracking branch 'origin/develop' into BACKLOG-946
BACKLOG-946 Swapped consent checks, checking if consent is disabled is now done before checking if user has stored consent
Merge branch 'BACKLOG-946' into develop