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



Signed-off-by: Marco Volpe <volpe@fortiss.org>