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