Issue-Ref: 4167

Signed-off-by: Johannes Eder <eder@fortiss.org>