Cherry-pick INTEGRATED-1048 to 0.7

Description

None

Technical tasks

None

Deployment actions

None

Status

Assignee

Unassigned

External issue ID

None

Client

None

Min. hours

None

Dev hour estimate

None

Fix versions

Configure