Issue-Ref:3427
Signed-off-by: Hernan Ponce de Leon <ponce@fortiss.org>