Signed-off-by: Reinhard Tartler <siretart@tauware.de> (cherry picked from commit f4f3300c09bb13eb7922e60888b55e3e0fb325e7)