PR: 77059 Submitted by: Jan Rochel <jannisan@t-online.de>
PR: 26253 Submitted by: Oliver Lehmann <lehmann@ans-netz.de>