Merge pull request #6966 from remitamine/kuwo