Commited by Unbabel.
Merge dev into unbabel