Handling controllers without localized flag well
Merge branch '31-internationalization-translations' into staging