Signed-off-by: Florian Eckert <fe@dev.tdt.de> (cherry picked from commit c4f3ac05288ba148fcd5c0222f34f393dbec57a2)