Co-authored-by: Stefan Jandl <reg@bitfox.at> (cherry picked from commit 6377c688fc7b35749d608bf62796446bb5bcb11b)