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