:Merge branch 'hotfix/erro' into develop
v2
Merge branch 'release/v2'