Merge branch 'release/7.0' into 7.0

Versao usada em producao
Merge tag '7.0' into develop

Versao usada em producao