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