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