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