Refatoracao da view para reduzir NPA
Merge branch 'Exceptions' into local Exceptions