requested review from @fratty
assigned to @fratty and @fabian.reister
merged
mentioned in commit 834fbae7