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

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