Backport INTEGRATED-631 to Integrated 0.4

Description

None

Technical tasks

None

Deployment actions

None

Assignee

Unassigned

Client

Integrated Marijn

Fix versions

Configure