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