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



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