Revert "Revert "Merge branch 'feature/frete' into develop""

This reverts commit 4aa44329fc2d03cd8e9fcb0f03a420002c466805.
Revert "Revert "Revert "Merge branch 'feature/frete' into develop"""

This reverts commit b1a9bf6527bd2cb7c0c94a45e92c08a643dbe363.
Revert "Revert "Revert "Revert "Merge branch 'feature/frete' into develop""""

This reverts commit e840a0744d13315542ffcc5f7a594bc6856b243d.