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