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