PR: 15721 Submitted by: KATO Tsuguru <tkato@prontomail.ne.jp>
PR: 14580 Submitted by: KATO Tsuguru <tkato@prontomail.ne.jp>