PR: 38692 Submitted by: maintainer
PR: 31139 (+ some changes) Submitted by: Udo Schweigert <ust@cert.siemens.de> Reviewed by: olgeni