Signed-off-by: Carl Schwan <carl@carlschwan.eu> (cherry picked from commit e21e53670c60b74ca2c49c01bf510ccdc5115b0d)