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