PR: 16038 Submitted by: KATO Tsuguru <tkato@prontomail.ne.jp>
PR: 14740 Submitted by: tkato@prontomail.ne.jp