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