PR: ports/135515 Submitted by: olli hauer <ohauer@gmx.de> Approved by: itetcu@ (implicit, fixing previous commit)