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



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

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



Signed-off-by: Saad bin Abid <abid@fortiss.org>