Signed-off-by: Helge Mader <ma@dev.tdt.de> (cherry picked from commit adaf3feb65918bd56ac3a24ac4fc68820f794a6e)