PR: 59465, 59473 Submitted by: Markus Brueffer <brueffer@phoenix-systems.de> \ KATO Tsuguru <tkato@prontomail.com>