PR: 21993 Submitted by: Motomichi Matsuzaki <mzaki@e-mail.ne.jp>
PR: 21207 Submitted by: Ports Fury
PR: 18141 Submitted by: KATO Tsuguru <tkato@prontomail.ne.jp>