Merge branch 'SEGURIDAD' into desarrollo