PR: 58166 Submitted by: Cheng-Lung Sung <clsung@dragon2.net>
PR: ports/25863 Submitted by: Jeremy Norris <ishmael27@home.com>