First part of patch from moriyama@miraclelinux.com (MORIYAMA Masayuki) to