Issue-ref: 3950

Signed-off-by: Carmen Carlan <carlan@fortiss.org>