Merged brazil mod here, the other merge request can safely be closed.
Merge details
mentioned in commit 676fc90e
merged