Issue-Ref: 4310
Issue-Url: af3#4310



Signed-off-by: Simon Barner <barner@fortiss.org>