Manually merged Kaiochao's pull request.