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

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