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