Issue-Ref: 4079
Issue-Url: https://af3-developer.fortiss.org/issues/4079



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