Se corrigen problemas
Merge branch 'hotfix/5.9'