Signed-off-by: Joseph Schuchart <schuchart@hlrs.de> (cherry picked from commit 08cb6389e034c1a70368671f745f20904c774a1e)