[PATCH master and f18-beta-branch (take 2)] Make language groups work again (#873865)