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



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