Sync xml fixes and language updates with upstream