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