PR: 35496 Submitted by: KATO Tsuguru <tkato@prontomail.com>
PR: 6725 Submitted by: Hans Petter Bieker <hanspb@persbraten.vgs.no>