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