[WIP] Test I18n 0.5 branch with fixes