Merge tag 'release-5.7' into develop

Configuración de rol editar
:mt: 2.1743.2710
Merge branch 'release-6.0'