Merge "App language migration"