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



Signed-off-by: Tiziano Munaro <munaro@fortiss.org>

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



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

Signed-off-by: Alexander Diewald <diewald@fortiss.org>