PR: ports/16728 Submitted by: Jos Backus <Jos.Backus@nl.origin-it.com>
PR: 10867 Submitted by: maintainer