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