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