PR: 19496 Submitted by: KATO Tsuguru <tkato@prontomail.ne.jp>
PR: 16693 Submitted by: Greg Robinson <greg@rosevale.com.au>