Fix staging PR: ports/181438 Submitted by: Chweigert Udo <Udo.Schweigert@siemens.com> Reviewed by: bapt (mentor)