PR: 24561, 24565 (followups) Approved by: maintainer
PR: ports/16638 Submitted by: Udo Schweigert <ust@cert.siemens.de>