Merge branch 'feature/clase2' into develop