PR: 55343 Submitted by: Mathieu Arnold <m@absolight.net>
PR: ports/30019 Submitted by: Fanying Jen <fanying@fynet.com>