Revert "Merge"

This reverts commit efcd288e87384f5ac45b05254038210d1dd0b861.
Revert "Revert "Merge""

This reverts commit e3cea37112578787d0b66608c1ea8f9e20c74e5b.
Merger
Revert efcd288..0d86c6d

This rolls back to commit efcd288e87384f5ac45b05254038210d1dd0b861.
Acerto de merge quebrado