Cambie la url del discard
Merge branch 'devel2.0' into PreIntegration
Merge con devel 2