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



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