Merge BB
Add pt-BR locale
Revert BB changes that broke the fields