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