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