PR: 28103 Submitted by: Juergen Lock <nox@jelal.kn-bremen.de>
PR: 16819 Submitted by: Juergen Lock <nox@jelal.kn-bremen.de>