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