Redo changes of MH-11660 that got lost in means of a regression

Description

It seems the PR #1391 has accidentally reverted some changes of PR #1067.

The goal of this task is to re-apply the lost changes again.

Steps to reproduce

None

Status

Assignee

Sven Stauber

Reporter

Sven Stauber

Criticality

None

Tags (folksonomy)

None

Components

Fix versions

Affects versions

4.0

Priority

Trivial
Configure