requested review from @RainerKartmann
assigned to @fabian.reister
merged
mentioned in commit 239e1236